From 2271df7c8df6dafee31e35e3d1394d02c0858d93 Mon Sep 17 00:00:00 2001 From: Christian Neumair Date: Mon, 7 Jul 2008 23:17:40 +0000 Subject: [PATCH] Skip update of accelerator child node if it has no associated action. 2008-07-08 Christian Neumair * gtk/gtkuimanager.c (update_node): Skip update of accelerator child node if it has no associated action. Fixes #541950. svn path=/trunk/; revision=20811 --- ChangeLog | 6 ++++++ gtk/gtkuimanager.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f7f855bb62..4c763940cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-08 Christian Neumair + + * gtk/gtkuimanager.c (update_node): + Skip update of accelerator child node if it has no associated action. + Fixes #541950. + 2008-07-07 Cody Russell Bug 541964 – [Win32] Setting modal hint to current value might confuse the stack diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index 256e416e19..33c71efbc6 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -2736,7 +2736,7 @@ update_node (GtkUIManager *self, gtk_widget_destroy (info->proxy); if (info->extra) gtk_widget_destroy (info->extra); - if (info->type == NODE_TYPE_ACCELERATOR) + if (info->type == NODE_TYPE_ACCELERATOR && info->action != NULL) gtk_action_disconnect_accelerator (info->action); free_node (node); g_node_destroy (node); -- 2.30.2